Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revise hallula #48728

Merged
merged 2 commits into from
May 28, 2021
Merged

Revise hallula #48728

merged 2 commits into from
May 28, 2021

Conversation

ToxiClay
Copy link
Contributor

@ToxiClay ToxiClay commented May 1, 2021

Summary

None

Purpose of change

This change applies a fix to my hallula bread; I forgot to include lard in the recipe. I think I've got it now, though.

Describe the solution

This adds the lard.

Describe alternatives you've considered

None.

Testing

Integrated the changes into my existing (very old, I need to update it) game version. Eventually found the recipe, and it looks correct.

Additional context

I don't know why it's claiming it can't automatically merge this. I based this PR off of 0.F-dev, as was proper.

Omega@Shinryu MINGW64 /g/GitHub/Cataclysm-DDA (revise-hallula)
$ git checkout upstream/0.F-dev
Updating files: 100% (583/583), done.
Note: switching to 'upstream/0.F-dev'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 3a8ae4e09f [Aftershock] misc typograpical fixes (#47783)

Omega@Shinryu MINGW64 /g/GitHub/Cataclysm-DDA ((3a8ae4e09f...))
$ git branch -D revise-hallula
Deleted branch revise-hallula (was 1ae66c97a0).

Omega@Shinryu MINGW64 /g/GitHub/Cataclysm-DDA ((3a8ae4e09f...))
$ git switch -c revise-hallula
Switched to a new branch 'revise-hallula'

image

@ToxiClay ToxiClay mentioned this pull request May 1, 2021
Closed
@KorGgenT
Copy link
Member

KorGgenT commented May 1, 2021

it probably just needs a force push to 0.F-dev again, since 0.F-dev was force pushed. this has been happening fairly often over the past few weeks.

@actual-nh actual-nh added <Bug> This needs to be fixed <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Bugfix> This is a fix for a bug (or closes open issue) and removed <Bug> This needs to be fixed labels May 1, 2021
@Saicchi
Copy link
Contributor

Saicchi commented May 1, 2021 •
edited
Loading

I like rebasing from master to avoid this problem, since the 0.F-dev branch is rebased/ force pushed all the time.

@ToxiClay ToxiClay requested a review from BrettDong as a code owner May 2, 2021 00:08
@ToxiClay
Copy link
Contributor Author

ToxiClay commented May 2, 2021

There shouldn't be any conflicts, though, because rebase asked me to fix them.

@BrettDong
Copy link
Member

Probably because the 0.F-dev copy on your computer is not identical to the one here on GitHub.

@actual-nh actual-nh removed the request for review from BrettDong May 2, 2021 01:13
@ZhilkinSerg ZhilkinSerg merged commit 9cc34d8 into CleverRaven:0.F-dev May 28, 2021
@ZhilkinSerg ZhilkinSerg mentioned this pull request May 28, 2021
Closed
14 tasks
ZhilkinSerg pushed a commit that referenced this pull request May 28, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
238f040
ZhilkinSerg pushed a commit that referenced this pull request May 31, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
a7c32bf
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
5ff567b
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
c6e779e
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
5fe37f9
ZhilkinSerg pushed a commit that referenced this pull request Jun 21, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
5cfd541
ZhilkinSerg pushed a commit that referenced this pull request Jul 3, 2021
@ToxiClay @ZhilkinSerg
Adding lard to hallula recipe (#48728)
ae33608
anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021
@ToxiClay @anothersimulacrum
Adding lard to hallula recipe (CleverRaven#48728)
3711b84
@ToxiClay ToxiClay deleted the revise-hallula branch July 11, 2021 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ToxiClay @KorGgenT @Saicchi @BrettDong @ZhilkinSerg @actual-nh